Forward port of issue #20157 to 2.3.0.M2.