Merge branch 'dl/xdiff'