[4.2] Docblock fixes
Merge pull request #5321 from KennedyTedesco/4.2-docblock

[4.2] Docblock fixes