Forward port of issue #19523 to 2.3.0.M1.