Merge r25262 to 1.12 release branch