Upstream version 2025-01-16