Add consortium
Update build-deps
Merge latest consort changes (currently just consortium)