Sync fork from upstream/main (bf01a42): merge preserving the Option-A watcher reconciliation - #13

Sync fork from upstream/main (bf01a42): merge preserving the Option-A watcher reconciliation#13

Quidge merged 13 commits into

mainQuidge/firstmate:mainfrom

fm/fork-sync-upstreamQuidge/firstmate:fm/fork-sync-upstreamCopy head branch name to clipboard