SRQ2419-2478

Enforced returns