Checkboxes view extracted as partial
Merge branch 'master' into checkboxes-partial
Merge branch 'master' into checkboxes-partial