[#67687236] Uncommented delegate code