Turn on diversity
Merge branch 'hotfix/v1.19.1'