[Bug 225639] Merge Review: cdrdao