DPA0171-7617

Enforced returns