Merge branch 'task/JAL-3141_Customise_checkbox' into task/JAL-3141_JAL-3247_merge