NTO4199-3576

Enforced returns