[EAP6-121] synch up with GC bzs
Merge pull request #6014 from aogburn/EAP6-121

[EAP6-121] synch up with GC bzs