Merge changes I95d59c55,I9fc8955a