GDP-845

* Changing RWorkspace to use GDP workspace