Merge r25184 to 1.12 release branch
Merge r25186 to 1.12 release branch
Merge r25188 to 1.12 release branch
Merge r25190 to 1.12 release branch
Merge r25192 to 1.12 release branch