Merge branch 'master' into feat/opencode-v2-compatibility