Forward port of issue #19880 to 2.3.0.M2.