Merge pull request #5964 in master
Update wrong DocBlock comment
Update wrong DocBlock comment
Merge pull request #5975
Merge pull request #5975 in develop