Merge conflicts
Merge branch 'the-darc-master'