Merge hydro on indigo branch