EZP-23441: cs review remarks