Merge branch 'jk/xdiff-interface'