Merge branch 'match-multiple-routes' into wip