JTA4086-7582

Enforced returns