Merge "Add required job and removed unnecessary jobs"