Merge main into per-language bundle follow-ups

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>