Forward port of issue #21039 to 2.3.0.RC1.