Forward port of issue #20438 to 2.2.6.