RHT8401-5940

Enforced returns