Merge remote-tracking branch 'origin/guofei_dev'
Merge remote-tracking branch 'origin/master'