enable subdirectory of csvs in zip files
Merge remote-tracking branch 'origin/rm_production' into rm_production