cs fixes
Merge pull request #3169 from dereuromark/3.0-cs

cs fixes