Fix cpu affinity with partitionable slots #3597
Merge branch 'V7_9_6-branch'