Merge from upstream #1

Merged
NotAlexNoyle merged 7 commits from master into master 2026-06-22 09:39:21 -04:00