Merge "Putting back generics for Workspace" into tm-dev