Merge branch 'hotfix/5392'

Close #5392
Tiny typo fix in docblock
Merge pull request #6126
Merge pull request #6126 in develop