Forward port of issue #21542 to 2.3.x.
Activity
Merge branch '2.2.x' into 2.3.x