eb-8038: enable the scheduler/job
Merge remote-tracking branch 'upstream/master'