Merge "Add json file to output zip"