Upstream version 2025