Address issue 556 and 568 on GitHub#583

contextablemark wants to merge 4 commits intoag-ui-protocol:mainag-ui-protocol/ag-ui:mainfrom

Contextable:mark/recreate-prContextable/ag-ui:mark/recreate-prCopy head branch name to clipboard