merged changes from hydro-devel