Merge branch 'rs/xdiff-fast-hash-fix'