[Indigo] Bring in Hydro updates