Merge changes I6bc37e88,I0514b26e