Forward port of issue #19690 to 2.3.0.M1.