Forward port of issue #20604 to 2.3.0.M4.