Merge r25248 to 1.12 release branch
Merge r25250 to 1.12 release branch