Forward port of issue #21554 to 2.4.0-M1.
Comment From: scottfrederick
Closed in 687b9b03531c2e187176a419ea0c18ef19a6b0c6