ZIP change submitted to trunk, integration being prepared to release