Merge branch 'jk/xdiff-drop-xdl-fast-hash'