Forward port of issue #20530 to 2.2.7.