Merge master and fix minor dispatcher issues