Merge r25260 to 1.12 release branch