Forward port of issue #21634 to 2.4.0-M1.