Upstream version 25.12