[Bug 226233] Merge Review: patch