backpored workspaceservice to 1.6
compiles with new workspace