Forward port of issue #21620 to 2.4.0-M1.