CS fixes
Merge branch '1.1.x' into develop