Fix EZP-20728

**DO NOT MERGE**