Forward port of issue #27482 to 2.5.x.
Activity
Merge branch '2.4.x' into 2.5.x