Forward port of issue #20343 to 2.2.6.