EZP-20231: fixed review remarks