Fixes remaining issues with initial workspaces creation
Merge branch 'develop'
Merge branch 'master' into release