[Bug 225652] Merge Review: comps-extras