CM 12.0 upstream