Forward port of issue #17796 to 2.3.0.RC1.