[Bug 226233] New: Merge Review: patch