Merge branch 'tg/range-diff-corner-case-fix' into maint