Merge changes Id14ebb05,I2a431693