AZC2973-2591

Enforced returns