Merge remote-tracking branch 'upstream/develop' into develop
Code cleaning for article
Merge pull request #919 from linzongshu/develop

Code cleaning for article