Merge branch 'main' into fix/329-subagent-extract