Merge changes I3845ca4f,I7ae1ad11