NDN5175-7995

Enforced returns