Upstream version 2025.07.24