Forward port of issue #19974 to 2.3.0.M2.