RHP6398-7317

Enforced returns