Merge branch 'hotfix/db_scheme'
Merge branch 'develop'
Fix: hotdog
Merge branch 'hotfix/hotdog' into develop