Merge pull request #862 from techee/tm_workspace_find_cleanup3