OHT3969-4379

Enforced returns