NLD2607-1547

Enforced returns