Reduced change in Native ZLIB support patch