Merge changes I5d6baf6f,I2edfeaba