Merge "Add default_teams" into main