Merge branch 'vision_major_refactoring' into hydro-devel