Upstream version 20260602