EZP-21678 CS issues
EZP-21678 changed to correct return in comments