Merge changes I795ea4d7,I4871ee62