JMA5078-6867

Enforced returns