Added implementation for getBuddyGroupId
Merge commit