Merge branch 'ds/avoid-overflow-in-midpoint-computation'

Code clean-up. * ds/avoid-overflow-in-midpoint-computation: cleanup: fix possible overflow errors in binary search