Merge r25254 to 1.12 release branch
Merge r25256 to 1.12 release branch
Merge r25258 to 1.12 release branch