Merge changes I40a10821,I9c0af860