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