Forward port of issue #18207 to 2.3.0.M1.