Merge branch 'hotfix/hotfix'
SQL Dump fix
Checkbox hotfix
Merge branch 'hotfix/hotfix' into develop