Merge changes I8a672b0e,I8f0a22a8,I2192d909