Forward port of issue #19656 to 2.2.3.