Fix bug in defining embedded collection
Merge branch 'hotfix/define-collection-bug'