Merge branch 'jk/xdiff-memory-limits' into maint-2.3