Merge "Add a tool for merging annotation.zip files"