Forward port of issue #19491 to 2.3.0.M1.