WEF6076-3579

Enforced returns