NFD1037-3189

Enforced returns