Merge changes I1a5340f1,I9bb2bdd9