Merge branch 'greedy-routes-fix' into 1027-greedy-routes