Forward port of issue #19637 to 2.2.3.