Merge "Refactor qtip jobs"