Merge remote-tracking branch 'origin/main' into fix/acp-drop-thought-chunks