Merge "Race condition fixes for refreshLinks jobs"