Forward port of issue #19857 to 2.2.5.