[Bug 225960] Merge Review: kdbg