Merge pull request #2128 from valentinewallace/2023-03-route-blinding-groundwork