Forward port of issue #19202 to 2.3.0.M2.