Merge pull request #986 from TheBlueMatt/2021-07-route-lasthop-value