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