Merge "Update checkboxes" into ics-mr0