Revert "Revert "commit by xufang for test""

This reverts commit 374388611d1c2b0680f6a43290d672ab861e6f72.