[2.3] CS And DocBlock Fixes