phpdoc fixes
Merge pull request #5589 in master
Merge pull request #5574
Merge pull request #5574 in develop