Upstream version 2024