Forward port of issue #20355 to 2.2.6.