Merge "Add feature to support multiple archive"