change multicore condition - take 2
Merge pull request #5406 from amaltaro/multi-condition

change multicore condition - take 2