Fixes typos
Merge branch 'hotfix/6219'

Close #6219
Merge pull request #6237
Merge pull request #6237 in develop