CS fixes

Signed-off-by: Graham Campbell <graham@mineuk.com>
CS fixes

Signed-off-by: Graham Campbell <graham@mineuk.com>
Merge pull request #6653 from GrahamCampbell/5.0-cs

[5.0] CS And Docblock Fixes