Merge changes from upstream #10

Merged
NotAlexNoyle merged 3 commits from main into main 2025-06-18 13:08:55 -04:00