clear people on cancel
Merge branch 'people_groups' into testing