Forward port of issue #19855 to 2.3.0.M1.