ComputeProximity returns 'Failure Error'
Merge remote-tracking branch 'upstream/master'