SONAR-5209 Workspace