edit by orain.xiong
fix by nancy.xu
fix bug by orain.xiong
fix conficts
fix by xiong
Merge branch 'branch-version1'