[Bug 226552] New: Merge Review: xdelta