Merge pull request #3225 from tritao/zip_stream_getters