Merge branch 'tr/xdiff-fast-hash'