Forward port of issue #51859 to 4.2.x.
Activity
Merge branch '4.1.x'
Merge branch '4.1.x'