Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' into develop
starting to remove PypelineConf and the use of that database