Merge changes I05fc93ee,I702d6831