Merge "Simplify permitted-path construction" into nyc-dev