Forward port of issue #21485 to 2.3.1.