Forward port of issue #19857 to 2.3.0.M1.