SHB5823-6807

Enforced returns