CB-6975 Improve the speed of the zip function