Forward port of issue #21620 to 2.3.1.