Forward port of issue #21698 to 2.4.0-M1.