Merge the code from upstream(bjteam)

Merge changes,including remove spaces.