DHQ4045-1481

Enforced returns