Merge pull request #3195 from tritao/zip_stream_getters