Merge branch 'hole_architecture' into hydro-devel