[Bug 225690] New: Merge Review: dhcdbd