Merge changes I9d352ddf,I2da9a916