Backport v2024 <- v2025dev1: Cherry-pich upstream patch fixing issue with expired certificates