adding support for buddy groups
Merge branch 'release/4.1.29'