Forward port of issue #19564 to 2.2.6.