Merge hydro-devel on master