Merge pull request #3953 from calvintam236/develop

[ci skip] Fix comment typos and strip some new lines