MDO6504-1762

Enforced returns