Merge r25196 to 1.12 release branch
Merge r25198 to 1.12 release branch
Merge r25200 to 1.12 release branch