378219 - generalizes the tools.launcher version
2 files changed