Merge pull request #8445 from bpfoley/rte-newurl