dispatch 6 and fixes
Merge branch 'dev-team' into development