Distance 0 handling
Merge branch 'develop'

* develop:
  Distance 0 handling