Merging master changes with hydro-devel