Forward port of issue #19856 to 2.3.0.M1.