OZP-10: CollectionView mixin
Merge branch 'master' into feature/ozp-245-floating-widgets