[Bug 225672] Merge Review: cvs