Forward port of issue #20997 to 2.2.7.