EHQ5358-3614

Enforced returns