Merge branch 'feature/create-collection'