Merge changes I178e467a,Ia8720c2c