Merge "cts: enforce cubic only on V+" into main