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