Forward port of issue #20041 to 2.2.5.