DNN4883-7614

Enforced returns