Forward port of issue #19637 to 2.3.0.M1.