Merge "Avoid loading duplicate jobs." into udc-qpr-dev