Merge r25293 to 1.12 release branch
Merge r25295 to 1.12 release branch