Forward port of issue #21480 to 2.3.1.