Forward port of issue #21701 to 2.4.0-M1.