YDO5179-5405

Enforced returns