Merge changes I6d95c1b3,I780070e0