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