Upstream version 2025-08-04