Merge branch 'pw/xdiff-alloc'