Forward port of issue #21101 to 2.3.0.RC1.