Forward port of issue #19192 to 2.2.5.