Forward port of issue #19807 to 2.2.7.