MDL-37429 zipping improvements