Merge changes I2e1aef32,Ib93e9d2a