refactor
Merge branch 'feature/issue-329-user-root-folder' into develop