Merge changes I26e0d43f,I9db62b54