OJD6583-6506

Enforced returns