Merge branch 'pr4997'
Closes #4997
fix typos
one more
fix another place
Merge pull request #5158
Merge pull request #5158 in develop