Merge changes I994c19ee,I245e9e7a