Upstream version 2025c