Merge pull request #4104 from Ericson2314/tool-depends