Update from upstream #3

Merged
NotAlexNoyle merged 18 commits from master into master 2026-04-13 07:05:31 -04:00