Merge "Create a common mechanism to check the validity of a zip file"