EHI3400-3459

Enforced returns