CS fixes
Merge pull request #3016 from peterkokot/patch-1

CS fixes