Merge branch 'proj/byterover-tool-mode' into feat/ENG-2697