OQM3969-5890

Enforced returns