merge from percy-g2 cm12.0