Merge r25252 to 1.12 release branch