Forward port of issue #20099 to 2.3.0.M2.