Forward port of issue #19599 to 2.3.0.M1.