Mainstreaming Diversity: From Paradigm to Practice?