[Bug 226235] New: Merge Review: pax