Add use statements
Sort use statements
Merge pull request #4699 from neeckeloo/add-use-statements

Add use statements
[#4699] CS fixes

- Trailing whitespace
Merge branch 'hotfix/4699'

Close #4699