Forward port of issue #20339 to 2.3.0.M3.