Diversity model
Enabled Racial Diversity option
Merge branch 'diversity'