[2.3] CS Fixes