CS fixes
Merge pull request #5333
Merge pull request #5333 in master