Merge branch 'hotfix/5343'

Close #5343
Fixes #4889
fixed typos
Merge pull request #5350
Merge pull request #5350 in develop
Merge pull request #5349