WFH5013-3842

Enforced returns