impl/EZP-22217 CS changes