Forward port of issue #18767 to 2.3.0.M1.