Forward port of issue #21754 to 2.3.x.