Forward port of issue #20134 to 2.2.5.