Make sure all study teams are restricted
Merge upstream master