Merge branch 'minor_changed' into hydro-devel