Merge "Upgrade zlib to d076d8bd089843ae105b1aeeda32dbeb667402ef" into main