Upstream version 2025.02