Forward port of issue #21688 to 2.3.x.