[Bug 225690] Merge Review: dhcdbd