Merge branch 'wip/new-jobd' into rorcz