Forward port of issue #19961 to 2.2.5.