Forward port of issue #19312 to 2.3.0.M1.