merge main into fix/tool-call-streaming