Port walkers from legacy branch.