CNF3884-5009

Enforced returns