Merge branch 'vision_fixes' into hydro-devel