Forward port of issue #21801 to 2.3.x.