Merge r25216 to 1.12 release branch