Merge changes I1c44532b,I22477f1c