Forward port of issue #21717 to 2.3.x.