Merge r25236 to 1.12 release branch
Merge r25238 to 1.12 release branch
Merge r25240 to 1.12 release branch
Merge r25242 to 1.12 release branch