Merge changes I7b52aa72,I2a77a84a