Merge pull request #2407 from ten24/feature-4-collections

Feature 4 collections