Merge branch 're-route-path-updates' into re-route-impl-2

Merge branch 're-route-path-updates' into re-route-impl-2 #392