Pick PR #307 (feat: add mcp) to next branch after merging #308
Description
Follow-up Task
This issue is to track that PR #307 (feat: add mcp) needs to be picked to the next branch after merging.
Context
This was requested by @fengmk2 in PR #307: #307 (comment)
Action Items
- After PR feat: add mcp #307 is merged to master, cherry-pick the changes to the
nextbranch - Close this issue once completed
/cc @fengmk2