Merge changes I1e9ed1dd,I86ae4ee0