Merge "Add the checkbox preference" into main