Merge r25246 to 1.12 release branch