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

* commit '7086cd5c75073b75cd4a7d61aaa9f0529450e4e5':
  Distance max set incorrectly