Merge pull request #1811 from valentinewallace/2022-10-chanman-router