Merging fixes in hydro into hydro-devel.