Merge r25194 to 1.12 release branch