Update hydro-devel branch