Merge "Remove filter_teams" into main