Whitespace fix
Merge pull request #18820 from rallytime/whitespace_fixing

Whitespace fix
Merge branch 'develop' into with-pylint-pragmas