Merge branch 'uniform_scan' into hydro-devel