WLI3884-0611

Enforced returns