Merge "Avoid loading duplicate jobs." into main