Merge r25220 to 1.12 release branch
Merge r25222 to 1.12 release branch
Merge r25224 to 1.12 release branch
Merge r25226 to 1.12 release branch
Merge r25228 to 1.12 release branch