Merge "Make use of \File::getArchiveRel to avoid code duplication"