XAI4012-4574

Enforced returns