merged changes from activate-group-item branch