WHB4986-8050

Enforced returns