Upstream version 2025.1