DistanceHandler available as singleton instance through DistanceHandler.Instance
Merge branch 'development' into singleton