Finish feature collection-radio-buttons
Merge branch 'feature-collection-radio-buttons' into develop