WBS9034-7804

Enforced returns