WIP: Checkboxes fix Issue #129

Closed Karmanya Aggarwal requested to merge checkboxes-fix into dev

#129 fix

Merge request reports