Rebase changes
Jobhandler commit