EZP-21621: Added regression test