Forward port of issue #19192 to 2.3.0.M3.