MFC0507-3747

Enforced returns