BDD4517-2401

Enforced returns