Forward port of issue #20011 to 2.2.5.