Merge branch 'hydro-devel' into hydro