Merge Cm 12.0 caf from percy-g2