Merge "Fix force copy"