Merge origin/main into new-hope for main deployment

Preserve new-hope content while linking divergent histories for fast-forward push to main.\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: berlogabob