Fix CS/WS issues
Merge branch '4.2' into 4.3
Merge branch '4.3'