Zip: backport from develop branch
Zip: compatible fix