[Bug 225691] New: Merge Review: dhcp