Forward port of issue #21695 to 2.4.x.