LPS-38557

cc @zberentey 
See my changes, I only made the change for Group.

Shinn will apply it to every other places.

Thanks