ALM2099-1906

Enforced returns