Added infrastructure for our own builders
Merge branch 'canary' into dev