Forward port of issue #21282 to 2.3.1.