Forward port of issue #20680 to 2.2.7.