Merge branch 'main' into proj/byterover-tool-mode