NGH7654-5489

Enforced returns