Merge branch 'rt/zlib-smaller-window'