Forward port of issue #19281 to 2.2.3.