Forward port of issue #19702 to 2.4.0-M1.