Group content tokens for label and referenced entity

The patch in #26 works well but not with the 2.0.x branch. Attached patch makes it work with version 2

Hi, patch #26 seems to work well. But it is conflicting with the subgroup module → .
The subgroup group-content plugin $content_entity_type_id is group, which is overridden by line 119

  $tokens['group_content']['group'] = [
    'name' => t('Group'),
    'type' => 'group',
  ];

I had a similar issue and created https://www.drupal.org/project/group_relationship_tokens → for that, maybe this could help here.