Forward port of issue #21375 to 2.3.0.
Comment From: mbhave
The original issue for this #21375 was reverted.