Forward port of issue #20418 to 2.2.6.