[Bug 445878] Separate better step done with actual job remaining during setup