Merged bugfixes from Test - Pushing zip