Remove trailing spaces
Merge branch 'Maks3w-hotfix/cs'

Close #5298