JCI5783-5888

Enforced returns