GPK4581-2586

Enforced returns