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