Porting to cmake fix garbage in dispatcher.
Merge remote-tracking branch 'origin/master'