Add Zip

issue4004
review9441002