Merge branch 'hotfix/task008'
Merge branch 'develop'
add set names charset
Merge branch 'hotfix/task009' into develop