ZIP service

(cherry picked from commit 1c8a88436527c35e7071c2253af25558ff9d29c6)