Merge "support multiple sets of airship files"