Merge branch 'jk/range-diff-fixes' into maint