Merge branch 'es/format-patch-range-diff-fix-fix'