Merge changes I104cd62f,I1d0238b4