The first change from lzhaodev

The first change from bzhangdev

Change from branch feature_1000