make coredispatcher fully BC again
Merge pull request #3759 from dereuromark/master-core-dispatcher

make coredispatcher fully BC again