Making cluster and hardcore options work better together
Merge branch 'cluster-prepare'