Merge changes I5927fb2c,I13853b13