am 5600deb7: am d26a8b73: am cda8329e: Merge "Distance max set incorrectly"

* commit '5600deb74858948205cd8f7709f03a7ae78c818a':
  Distance max set incorrectly