Forward port of issue #20623 to 2.2.7.