Fork from delegate 9.9.11