Forward port of issue #19595 to 2.2.3.