PCH3670-3162

Enforced returns