Merge branch 'new_victim' into hydro-devel