Merge pull request #1694 from jurvis/jurvis/2022-08-move-scorer-from-router