Forward port of issue #20438 to 2.3.0.M4.