Merge "[Bugfix] Check for presence before ZipWrite"