Added combi-tool.
Merge pull request #7065 from Zuhayr/combitool

Added combi-tool.