Merge branch 'new_states' into hydro-devel