Forward port of issue #19880 to 2.2.5.