BTY2668-3809

Enforced returns