NPF4393-6470

Enforced returns