Break c4 out of Drake
Merge branch 'develop' into feature/preview