Merge pull request #1077 from jkczyz/2021-09-failing-route-hop