Merge branch 'hotfix/0.6.4'
Merge branch 'master' into develop
fix missing Dialogue index
fix flash bar layout