Merge r25230 to 1.12 release branch
Merge r25232 to 1.12 release branch
Merge r25234 to 1.12 release branch