Merge branch 'gears' into hydro-devel