Diversity is good, but diversity for diversity's sake is not good. I think teams should be made based on merit, and if then the team is also diverse, all the more better. Although important, imo making diversity the most important criteria seems a bit misguided and somewhat idealistic although on paper and in principle it seems to be coming from a good place.