Merge "Fix double accounting of skipped objects during copying"