Merge pull request #2781 from jkczyz/2023-09-multihop-paths