Finish feature collection select
Merge branch 'feature-collection-select' into develop