EZP-21324: Added regression test