Forward port of issue #25808 to 2.4.x.
Activity
Merge branch '2.3.x' into 2.4.x
Merge branch '2.3.x' into 2.4.x