Remove trailing whitespaces
Merge branch 'hotfix/#6487-trailing-spaces-removal-hotfix' into develop

Forward port #6487