Merged from develop branch
Merge pull request #1295 from linzongshu/article

Merged from develop branch