Forward port of issue #19969 to 2.2.5.