Forward port of issue #20531 to 2.2.6.