Groups were not being properly created when the customer_conext switchwas being passed