ROZ4392-1769

Enforced returns