Merge branch 'es/overlapping-range-set'