Merge branch 'dw/recursive-dispatcher'