Forward port of issue #19710 to 2.2.4.