Merge remote-tracking branch 'origin/hydro-devel' into hydro-devel