Merge remote-tracking branch 'origin/main' into feat/tool-token-budgets