[Bug 225639] New: Merge Review: cdrdao