Merge "Upgrade zlib to 37d9855c8db5a130571971e78fde2740314cd98a" into main