Merge changes Id40d25d3,I12263a65