[Bug 225948] Merge Review: joe