Close #5296
Remove trailing spaces
Merge branch 'Maks3w-hotfix/cs' into develop

Forward port #5298