fix dispatcher issues
Merge branch 'release/v0.6.0'