Forward port of issue #21595 to 2.4.0-M1.