Forward port of issue #20793 to 2.2.7.