Working on rollup quartz job
Merged conflicts