merge master into new default branch hydro-devel