Forward port of issue #21664 to 2.4.0-M1.