Merge "Replace cpi->common with preset variable cm"