Update PhpDoc comment
Revert change
Merge branch 'hotfix/4509'

Close #4509
Merge branch 'hotfix/4458'

Close #4458
Merge pull request #4518 from localheinz/hotfix/update-php-doc-comment

Update PhpDoc comment
Merge branch 'hotfix/4518' into develop

Forward port #4518