There seem a bunch of conflicts already with trunk for the existing multicore PRs:
So it would require some rework anyway