Re-pick the master source.

Hi, i'ld to re-pick the master source code.