Merge changes I2b52f659,I894bb969