Upstream version 26.06