Merge from nbTeam