TBF9479-4968

Enforced returns