Forward port of issue #19221 to 2.2.6.