Forward port of issue #46008 to 3.5.x.
Activity
Merge branch '3.4.x'