Finish feature collection_check_boxes
Merge branch 'feature-collection-check-boxes' into develop