Merge from upsteam #3

Merged
NotAlexNoyle merged 62 commits from lightning into lightning 2026-06-01 14:58:02 -04:00