[Bug 225652] New: Merge Review: comps-extras