Merge branch 'hotfix/cs'

Fixes CS issues
fixed typo
Merge pull request #5398
Merge pull request #5398 in develop