Forward port of issue #29900 to 2.6.x.
Activity
Merge branch '2.5.x' into 2.6.x