Forward port of issue #21317 to 2.3.x.