Merge branch 'hotfix/hotfix'
Fix
Database flowcharts fix
Merge branch 'hotfix/hotfix' into develop