Forward port of issue #19782 to 2.2.7.