Hmmm, yeah I think we should move it to the same job as well. It may not be trivial but it can be considered a subtask.