Forward port of issue #21507 to 2.4.0-M1.