PDR4640-3841

Enforced returns