Story 419: Nearby distance enhancements

Change-Id: Iea3a3776eb05d5c1e8d5b0ad9964895aed2d64d6