Fixes remaining issues with initial workspaces creation
Merge branch 'develop'