Merge changes I8fe016c2,I75842f8e