Merge branch 'throw-type-routes'