Merge from upstream #5

Merged
NotAlexNoyle merged 37 commits from master into master 2026-04-22 13:39:08 -04:00