Forward port of issue #19566 to 2.3.0.M1.