Merge branch 'jobd-updates' into rorcz