Forward port of issue #19367 to 2.3.0.M1.