Merge branch 'xid-hash'