Merge remote-tracking branch 'origin/new_states' into hydro-devel