OMQ4794-4975

Enforced returns