Merge branch 'hotfix/5146'

Close #5146
Fixes #3035
CS fixes
fix typo
Merge pull request #5336
Merge pull request #5336 in master
Merge pull request #5336 in develop
Merge pull request #5333
Merge pull request #5333 in develop