Merge "Change how distance field paths are disabled"