Forward port of issue #21095 to 2.3.0.RC1.