cs fixes
Merge pull request #2118 from Guite/1.4

cs fixes