Merge master and hydro-devel