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

* commit 'd26a8b73c918f04fc1d78c03b721eca3757e446a':
  Distance max set incorrectly