ZLD2504-2527

Enforced returns