Forward port of issue #21675 to 2.4.0-M1.