Forward port of issue #20530 to 2.3.0.M4.