fix typos
Merge branch 'hotfix/5040'

Close #5040
Merge pull request #5042
Merge pull request #5042 in develop