Upstream version 2025.4