Forward port of issue #19956 to 2.2.5.