CS fixes
Merge pull request #5333