Merge changes I8b6b8510,I1cae6174