Forward port of issue #21556 to 2.4.0-M1.