restore associate_with_group method
Merge branch 'group_associate_hotfix' into development