[Bug 226235] Merge Review: pax