Bugfix on base collection view
Merge branch 'hotfix/collection-view-initialize'