WIP: Update v1 with improved routing
Basically: Merge master in, then change DisasterRouter back to v1. When reviewing, make sure everything looks okay (esp. in DisasterRouter) - but you don't have to review every single line as those were already reviewed when going into master.