Merge r25297 to 1.12 release branch