Merge changes I2edbb6b3,I0774c1a5