DXC4232-6397

Enforced returns