Fix team assignment
Merge branch 'master' into prod