Merge latest from upstream #2

Merged
NotAlexNoyle merged 105 commits from lightning into lightning 2026-03-25 05:45:33 -04:00