Abstract common functionality and officially support non-forked runs.
Merge branch 'master' into ddc-build
Merge master and update version.