Merge branch 'feature/card-collection-init' into develop