Forward port of issue #20135 to 2.3.0.M3.