Merge origin/main into feat-stale-graph-warning