minor fixes in dispatchers
Merge remote-tracking branch 'origin/next' into get_implementation