ZIP service

(cherry picked from commit 397b17078e4ebe3879ec98472f8bdd4bc29b92b9)
ZIP service

(cherry picked from commit 61b36714d0648147277f1f8c00bd21a94b10d4c9)