Merge changes I86c1045b,I9fc533ac