Merge pull request #3996 from calvintam236/develop

[ci skip] Fix some docblock typos