5 Years Ago
Merge from team_drop_fix