Forward port of issue #19510 to 2.2.3.