Forward port of issue #21673 to 2.4.0-M1.