Merge pull request #2412 from valentinewallace/2023-07-construct-blinded-paths