Merge changes I896fe6f9,I90d8b167