Forward port of issue #20378 to 2.3.0.M4.