Merge changes Id4f2abbd,I3981d42f,I43fe9914