Forward port of issue #21640 to 2.4.0-M1.