Forward port of issue #19987 to 2.3.0.M3.