RAZ-1783: ZIP extraction could not place files into correct folders, especially from within sub folders
Merge branch 'feature/zip' into develop