Merge "Do not pass $archiveName two times to OldLocalFile"