HGO4671-6415

Enforced returns