Forward port of issue #19566 to 2.2.3.