make delivery direct or not using configuration flag, use of new core delivery object
fix merge conflict
Merge branch 'gdchamal-parameters' into develop