Forward port of issue #19913 to 2.2.5.