Merged from team_redundancy_team