Forward port of issue #19956 to 2.3.0.M2.