ezp-21977 fixed CS issues