Merge changes I8c744a32,Id357ac37,I7df87e14,I2abd173c,Ie53b1dfd