Merge "Fix cancellation of copy jobs."