Forward port of issue #21036 to 2.3.1.
Comment From: scottfrederick
Closed via 7a793a11fba337e5971bad2849f784d80d74342e