Can edit and remove ProductGroups
Merge branch 'phase2'