Forward port of issue #20709 to 2.2.7.