Merge hydro-devel and hydro