DO-NOT-MERGE: Content Views: handle composite content views.

Allow creation and update of composite content views.

#### TODO
- [ ] Tests
- [ ] Address PR comments