Forward port of issue #20577 to 2.2.6.