Merge branch 'hotfix/hotfix'
Fix
Form checkbox fix
Merge branch 'hotfix/hotfix' into develop