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