add builder and runner to config
Merge branch 'master' into release