Merge pull request #1398 from jkczyz/2022-03-middle-hop-fix