ZIP service

(cherry picked from commit c5dbe39fdf76e1279df7cf87f671ec31c3d55bca)