Forward port of issue #31676 to 2.7.x.
Activity
Merge branch '2.6.x' into 2.7.x