Merge pull request #12977 from mitaclaw/branch-watch-tool-fixes-4 Branch Watch Tool: Refactors, Fixes, and Features