Merge "include domain_id when creating groups"