Forward port of issue #20333 to 2.4.0-M1.