Forward port of issue #21515 to 2.4.0-M1.