Merge branch 'mdw/cpu-dispatch'