fix typo
fix wording too
Merge branch 'hotfix/5412'

Close #5412
Merge pull request #5421 from samsonasik/fix/typo

fix typo & wording
Merge branch 'hotfix/5421' into develop

Forward port #5421