Merge "Native routing phase 4" into nyc-dev