Scan distance min max
Merge remote-tracking branch 'upstream/master'