HSH3625-3671

Enforced returns