HPT3484-0614

Enforced returns