[Bug 225785] Merge Review: gdm