Got it. I have sent out v3 code patch, please help to review it when you are available, thanks.

Jason Lou