Use hard walk limiting in long-distance mode
Merge branch '1.0.x' into experimental