Merge "Fix "Clone" call"