CXT6114-5987

Enforced returns