[Bug 226554] Merge Review: xen