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