merge group_terms branch

Going to merge group_terms branch.