Merge changes I1ba91f59,I6d69f9da,I99ddffb1,I6fdc9d42