change multicore condition - take 2

Please take this PR instead of #5399 , since the later cannot be merged anymore :-)