un-tick 'Select all' checkboxes and fixed previous step
Merge branch 'previous_step_and_checkbox_fixes' into develop