Forward port of issue #51555 to 4.1.x.
Activity
Merge branch '4.0.x' into 4.1.x