add hybrid partitions
.
Merge branch 'public-samplingstartegy' into lyraswitch
.