CBF4644-5536

Enforced returns