RCE8609-5497

Enforced returns