DB scheme change
Merge branch 'hotfix/db_scheme'
Merge branch 'hotfix/db_scheme' into develop
Merge branch 'develop'