Forward port of issue #20361 to 2.2.6.