fixed dispatcher error when not intro M delimiter
Merge remote-tracking branch 'upstream/master'