Forward port of issue #20756 to 2.2.7.