Forward port of issue #19584 to 2.2.3.