Merge origin/main into naming, resolve conflicts with module rename

main

Commit

copilot4mo ago

Co-authored-by: pjbgf 5452977+pjbgf@users.noreply.github.com