Forward port of issue #19855 to 2.2.5.