Comments out combi-tool, fixes infinite range combitool.
Fixes #7472
Merge pull request #7476 from Zuhayr/dev-freeze

Dev-freeze tweaks.