Merge team additions from upstream