FOE3568-0536

Enforced returns