Forward port of issue #41208 to 3.4.x.
Activity
Merge branch '3.3.x'