Forward port of issue #20719 to 2.2.7.