OCF6548-4658

Enforced returns