Forward port of issue #21684 to 2.4.0-M1.