[Bug 225786] Merge Review: gd