Merge "Non-functional refactor to move logic into RouterRecord" into udc-dev