fixed typos
Merge branch 'hotfix/#6116-typo-fixes'

Close #6116