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