Merge pull request #3512 from vieux/attach_job

move attach to a job