Forward port of issue #20583 to 2.2.6.