Forward port of issue #16783 to 6.5.x.
Activity
Merge branch '6.4.x'