add content-length header
Merge branch 'mm-zip-to-files' into staging2