Merge branch 'ab/range-diff-no-patch'