Forward port of issue #19520 to 2.3.0.M1.