Merge r25272 to 1.12 release branch
Merge r25274 to 1.12 release branch