Forward port of issue #21687 to 2.4.0-M1.