collection checkpoint
Merge branches 'collection-view' and 'master'