EAL8394-8373

Enforced returns